Codemaid Cleanup
Resharper Cleanup