make a stronger point about OO and further refactoring