major cleanup for checkout payment and shipping pages
major cleanup for checkout payment and shipping pages