code style cleanups