Yes, it needs to be refactored, but I didn't have time to do it yesterday and wasn't sure if it was part of the scope of the ticket.