Make internal functions static