#696 - minor cleanup