Change static methods to non-static.