format+cleanup