Minimize duplication
Flatten command branching (return without else)