[CleanUp] Refactoring