Refactor truck index