lots of style changes as discussed with Gayatri and Maheima
Merge pull request #22 from vadhawal/master

lots of style changes as discussed with Gayatri and Maheima