TODO squash up. chore(*): address Igor's comments