KGSQA-864 more code review changes