Variable/comment cleanup related to #7, adding API mappings, new ServiceDeliveryCalculator API