Refactor council