code refactoring for standardization of coding style
Merge pull request #167 from irvs/issue149

code refactoring for standardization of coding style