[TASK] Clean-up code