Remove superfluous exit
Reorder command logic