Make some functions static which should have been