[REF] code refactor + improve help + fix typo