Merge pull request #152 from StanleyDing/master

Improve code readability.
Improve code consistency.

Add some line breaks between string literals.
Add a missing semicolon.