doc and style cleanups