Cleaned more up.