MODE-1805 Minor cleanup of code per code review