command and set keywords added
code cleaned