Refactoring, objects. :-)