Cleaned stuff up a bit.