lint some
lint some more
Merge pull request #806 from shackbarth/lint

some linting