minor refactoring
Merge pull request #67 from ramith/master

minor refactoring