refactor extractor
refactor injector
fixes #136