Some app command refactoring