Fix refactoring to cucumber helpers
Fix JSHint warnings