Move this helper off the class