FIX interactive call for help and list commands
Refactoring