MYLOC-38 Minor updates following code review.