Refactoring substitutions
Refactoring substitution mechanisms
Revising substitution mechanisms
Refactor substitutions