Resharper tidy up