Turn more functions into static