Cleaning up to make it easy