finish format/revert task; clean code