Cleaned up with Re-Sharper
Normalized Line ending & removed unused refs