Merging Nandu's style cleanup pull request.

I did a manual merge to bring #169 into master.