MarcExtractor, rearrange and correct inline docs