Replacing the #184 PR - fixed coding standards

Replacing the #184 PR - fixed coding standards