some minor cleanup stuff