Comments translation and minimal refactoring