Clean up some types