changhong authored May 11, 2017 and Péter Szilágyi committed May 25, 2017

1. fix typos
2. methods recevier of struct should be same
3. comments improve

(cherry picked from commit 1ba979539582a00b7fd1a7c8a37a6852e59eac0d)