[Task XXX] reformat and clean