Do some linting on the code

`rake lint` will show a *few* warnings, some of them making sense