Syntax cleanup and minor refactoring.
Merge pull request #1 from hatahet/master

Syntax cleanup and minor refactoring.