Small cleanup + switched to multibot in main program