Tidy up before Graham
First draft of feedback