Tidy up, to make them more the same