Tidy up types