Improve argument lists for Main method