Refactor: checkout and lookup order
Update code overall