Moved static function declarations to header file