Revamp BarcodeGeneration.java