Reworking markup for scannability