Barcode Scanner fixed & optimized