Changing more methods to static