Handle arguments more cleanly