Cleaned up args

I (hopefully) cleaned up the args.