Refactor playbooks