cleaned some more stuff up