Cleaned the code with the resharper