Improving code OOP