minor cleanup #796