INTEXT-5: Code review changes