Cleaned up a bit and made couses and teams dynamic