OOP cleanup