Team Status Conditions & Code Refactors