more minor cleanup stuff