Feature/clearer wording