Turned many member functions into static functions