[TASK] Clean up codes
[TASK] Clean up codes