some more minor cleanup