Refactoring of playbook