Small refactor for cohesion. Sync with Mapper implementation. Update README