Yet more refactoring a la ReSharper - almost all done except for moving strings to external resource files