refactor to cleanup.  Stepdefs now expect named arguments
stepdef verbiage is now correctly generated