Refactoring: Making it more OO