cleaned stuff up a bit