Refactor
Fix bug in Barcode Reader.