Merge pull request #2872 from darwinel/develop

Writing style fix based on style guide