[CleanUp] Clean code