more minor cleanup