Various style cleanups