Tidy up and other things as discussed