refactor feature for cucumber