Tidy up & comment