Some style cleanups