whitespace and formatting cleanup
resharper code cleanup