move global functions into classes as static methods