Make code more "OOP".