Removed resharper message
Refactored structure