#478 - Fixing checkstyle issues for Travis CI