struture update and wording for constants