few style cleanups