OOP restyling