Refactoring policy writing