TISTUD-1614: addressed Clayton's latest feedback.