:lipstick: Clean up getCmdAndArgs a bit

Separates out two independent pieces of logic

Test Plan:
Ran specs