Cleaning up and ordering things