move static functions to top of class