Clean up code.
Merge pull request #19 from PreetamJinka/issues/18

Clean up code.