Refactor by putting methods on their target objects