more checkout flow and tidy