Reorganize by adding to helper class