Simplify command parsing