Localisation refactoring