Refactoring commands 2/2