Massive Checkstyle cleanup