TYRUS-232: incorporating pull request feedback