Fix up to pass most lints (apart from 80char check)
Merge pull request #3 from cpganderton/fix-lints

Fix up to pass most lints (apart from 80char check)