[Refactor Ticket] use helper