Make functions static which should have been