[+TASK] code cleanup