yet more minor cleanup