Drive-by refactoring to improve cuke execution speed and terseness