Code cleanup: cmd args