Checkstyle cleanup