Again, too much updates
Fixed some coding style issues
Merge pull request #12 from jaytaph/codestyle

Codestyle