cleanup and style fixtures
Merge pull request #55 from adityabakle/master

cleanup and style fixtures