Cleaned up some resharper warnings