Tidy up, remove of superflous gumph, more comments