Improved Style

A few things look nicer.