Prettify!

Cleanup and small fixes.