refactor utilities
Make an extractor class to track data mappings