Refactor static methods into their own class