Moar lint

Disregard previous pull request, this one has both :)