MYLOC-59 Cleaning up after feedback