Cleaned the mess up a bit.