clean up some arg handling