Internationalize and some refactorings