refactor
keyword commands are finished