Code clean up
Multicharacter conversion
Punctuation whitespace fixes
Reordering of regexps