BLK-162 improves code clarity ready-for-review