[CleanUp] Clean the code