Clean up

Cleaned it up a bit, and tried a few things out.