Refactored Synonymparsing