#487 - Fixing checkstyle issues
#487 - More checkstyle issues