bus: cleanup more classes by using lambdas