#763 - minor code cleanup