Tidy up conversion