Move title cleaning logics to modifiers,

replace fullmatch with match for definitions