Cleaning up is even better now