fixed all lint and code style problems
Merge pull request #55 from DogMatch/paul-fixes

fixed all lint and code style problems