Tidy up to reflect recent changes