Tidied up resharper \ stylecop issues.