Style updates. refs comment 42 bug 863160