This is simply a cleaning up of Main.