minor refactoring
Merge pull request #2 from nitesis/master

minor refactoring