Version 1.6.2: Remove callback class and instead directly loop through all replacements

Restructure code to get away from the helper class, instead create explicit list of replacements