Get rid of named returns in main