clean up types