Add static keyword to all static functions to prevent warnings