some style cleanups