[TASK] code cleanup