Cleaned stuff up