Started separating Utils into individual helper classes