Code clean-up and warning emission related to picking up fuel.