a little more tidying-up

Comments added, unused code removed.