Moved static methods into their own, logical classes