MYLOC-83 - PR feedback
MYLOC-83 - Fixing PR feedback