Cleaning up the code: