Abolished horrible static classes & added teams