minor refactor to block run