Tidy up MainWindow.cpp

.. comments and reorg whats left.