cleaned stuff up more