minor reformulation of structure