Cleaned bits up.