Cleaning up types