Tidy up and remove incorrect comments