even more minor cleanup