Remove trivial lint erros

Hi - here's the updated pull request with the two debatable changes left out.

Cheers.