More checkstyle cleanup