Refactor some
Merge pull request #13 from sunny-mittal/sunny

Refactor some