Lots of styling cleanups