Cleaned up a bit.
A bit more cleaning.