Correct way to modify root files. A little bit of refactoring. Slowly moving towards localization support