Cleaning up Code