[Task APIFEST-XXX] reformat and clean