Turn two functions static