stylistic refactorings
Merge pull request #3 from sachinr/master

Stylistic refactorings