Corrected OOP setup and cleaned up