checkstyle cleanup