Tidy up commenting