[refs #6 #7 #8] Small code tidy up after various new features