Minor cleanup functions file