Revert of argument passing to Main