Cleaning up and making changes