Slightly better command handling
Even better command handling`

Plus less repository repetition