minor service restructuring