Code improvements

ReSharper inspection N2