Merge pull request #1738 from gennadiycivil/master

Code formatting changes, clean up, no functionality changes