Fix style: move each static function to an appropiate namespace