GitLab

Fix carrier type map.
Refactor helper functions [WIP]
Document helper functions [WIP]
Improve logging for helper functions [WIP]
Update tests