Adjust barcode checking
Refactor OneUpPatioBlock