style cleanups