refactor feature and scenario for readability