[TASK] Code cleanup