Tidy up Main