[Refactoring] CleanUp