Tidy up and some notes