More style changes for issue #59. [skip ci]
fixed merge conflict