Moving local strings to Resources and addressing code review