Clean up

Cleaning it up a bit.