o a bit less confusing name service_name -> service_id (also type -> service_type)
o comment the confusing choice of service_ids that seem to be non-standard.
o fix some indentation issues.
o Change ServiceIDs back to 'standard' service IDs.