policies refactor