Simplifying the layout of Element state, no "functional" changes