Minor changes in TeamWork OOP