Cleaning up Code.