Should I pull it out into a separate util class?