Refactored classes, moved bulk to base class and cleaned up other barcode types.