Code quality issues
Merge branch 'Resharper'