refactor teams assoc