INTEXT-6 More code review changes made.