misc cleanup
misc cleanup-2
Merging changes
Merge pull request #222 from raghavgautam/cleanup

misc cleanup