Further tidy ups