Minor formatting changes per style guide

/to: @sam-github @chandadharap - please check, if you can