Further tidy up