Tidy up and name change