Merge pull request #1 from anishathalye/master

Clean up code