#423 - Fixing checkstyle issues