Make some functions static