cleaned stuff up

cleaned more stuff up