teams refactoring and cleanup pt.1