Service builder review: addressed comments

Service builder review: addressed comments

@sez11a