Handle arguments better