Just minor cleanup