style enhancement
Merge pull request #1537 from grandoc/3.5

style enhancement