XD-2340 Code review changes