Cleanup

Cleaning up a bit.