Same comment here, as far as possilble lets move the literals and constants out of the source files and then refactor to a better solution, we had it better before this change - I think.