[Formatting]  -   Cleaned up code formatting
Merge pull request #1253 from rmansoor/master

[Formatting]  -   Cleaned up code formatting