Tidy up and comments