XD-2332 Code Review Changes