Further tidy