Moved static methods to top