Style lint warnings and errors
Merge pull request #1 from nightkin/master

Style lint warnings and errors