Merge pull request #1705 from gennadiycivil/master

Formatting changes,small cleanup,  no functionality changes