just a minor cleaning of code
working on cucumber tests