MainWindow class refactoring checkpoint. Pending comment translation.