Cleanup warnings, style
Merge pull request #91 from square/edenman/warnings-n-style

Cleanup warnings, style