XD-2203 Code review changes