Code Optimizations

Code Optimizations Resharper