Improved a few style points