[TASK] Code Clean up