just minor cleanup stuff