Cleaned up Team Cs code