Cleaning up Main