continuing with breaking lambdas into service classes