[task] code cleanup