Cleaned a bit.