Bot refactor
Bot refactor