some style cleanups.