minor cleanup stuff