Making a few local fn's static