Code CleanUp

Clean up code.