Fix style consistency errors, minify code better
Merge pull request #34 from thejameskyle/minor-changes

Fix style consistency errors, minify code better