#525 - Fixing checkstyle issues in order to push snapshot build