Simplify command flow