cleaining up some more stufffs