Close #17 Fix localization
Remove useless commands
Refactor commands