Tidy up, should be no function change