First step in refactoring to an OO approach