some more little cleanup stuff...