Attempting refactor of cmd args