Cleanup the wording of the Cucumber scripts