tidy up and additional comments