Small tidying in Main class.