refactoring commands
refactoring commands v2

refactoring commands v2