Bot class refactoring