tidy up & comment