more style cleanups