Style and comment cleanups
Merge pull request #226 from Nikerabbit/fixes

Style and comment cleanups