Refactor bots to not use `return` where not necessary