Added ExpectedBotCondition, refactor, fix warns