Change some static methods to member methods