More MainWindow tidy

.. reduce the number of public members