minor refactor istanbul