standardize code
Merge pull request #1063 from grandoc/develop

standardize code