Some more very minor cleanup