Tidy up Dave's changes so role is properly documents, note these changes are backwards compatible but it is simple to change customer var or playbooks