Refractored according to JBehave tutorial