MYLOC-109 Minor updates following code review.