Fixes linter warnings.
Merge pull request #31 from huitseeker/small-cleanups

Fixes linter warnings.