some changes left out from last week
A tidy up