Fix regexp
Preservation of formatting in place.
Completed format preservation