XD-1768 Code review changes