minor cleanup stuff.