Improve code consistency
Merge pull request #4 from dante2008/master

Improve code consistency