Tidy MainFrame a few lines