I'd prefer handling the refactoring as a separate ticket.