[#797] Set locale identifier and display name when retrieving survey instance

Based on changes recommended by @mtwestra
[#797] Source code formatting and delete unused code