major refactoring of cucumber stories