Refactor truck location