Refactor hand and team creation