Small invoice cleanups; renamed OrderData to ItemTypeData to be more specific and accurate