some commenting
refactoring createTargetMap
progress with splitting fetch into modules