Fix up comparison warnings
Minor cleanup and comment