Cleaned stuff up.