Added teams + some clean up