improved formatting and renamed internally used aggregate-service