#781 - minor cleanup