Cleaned stuff up!