Resolved Resharper Code Issues