Improve code readability.
Merge pull request #152 from StanleyDing/master

Improve code readability.