Refactoring

Resharper fixes