Cleaning up and expanding