More refactoring a la ReSharper; also a few migrations of string literals to Resources to enable internationalization