[task] do some code cleaning