Clean-up code adding further comments