Refactored stuff, Barcode Reading works