Change states to use short-dec style