Fixed checkstyle warnings
Merge pull request #323 from spotify/rculbertson/fix-checkstyle

Fixed checkstyle warnings