CheckStyle Mostly Done