Refactor cucumber finales