Tidy up + changes following comments