refactor extractors to choose ollie or reverb