XD-863 Code review changes