tidy up a bunch of lint errors
Merge pull request #386 from shish/linting

A few fixes for things scrutinizer-ci found