checkstyle cleanup and enforcement