update wording / cleanup