#349 - Checkstyle cleanup for SNAPSHOT