Code CleanUp.