Simplify command dispatch

Lays the ground for the help system