Cleaned up MainForm