Translate comments and minimal refactoring