Better oop structure.