Fix linting warnings

I ran the project through eastwood, kibit and bikeshed and made some changes. What do you think?