Code cleanup.
Merge pull request #20 from Sharparam/patch-12

Code cleanup.