[TASK] Code Cleanup