Tidy up: add comments better output messages