Unnecessary refactor but wanted to try with extractor objects