Fixed & cleaned.