rename commands
and code refactoring
add variable class
and code refactoring