INT-3085 Code review changes