more command registration refactoring