Minor refactorings a la ReSharper - to be continued