Reformat and remove useless class