Migrating to OOP
Compleate migration to OOP
Clean some code