Refactor commands a bit