[TASK] Clean up code