[#276] Refactoring SurveyedLocale creation

Cleaning up some duplicate code and simplifying the creation steps