Removed some resharper suggesions