Make functions static if they can be