Team Class and Code Cleanup