MYLOC-142 Updates after code review.