start of style cleanups