Refactor management team