Refactor some cucumber feature language