Code Clean, formatting and OSS header changes

Resharper - Clean Code
Code Clean, formatting and OSS header changes