Refactoring+Team fixes