refactoring shell and commands
clean