Minor linting stuff
Merge pull request #1082 from ahinz/topic/lint

Minor linting stuff