Some teams refactoring