Some code improvements

ReSharper inspection N1