Cleans up types