OOP and better code