Style fixes and small code cleanups.
Merge pull request #1 from nens/roland-stylefixes

Style fixes and small code cleanups.