Resharper refactor

Cleanup