Minor cleanup of navutil
Minor cleanup of navutil