Minor refactoring with xaml names and MainWindow private variables