[TASK] Code CleanUp