[OOP] Some minor changes