Make functions static