[TASK] Code clean up done