Refactoring NoCommand