Merge pull request #31 from sunny-mittal/sunny

Fix merge conflicts
Make some style/formatting changes
return point
Change some styling
Change some verbiage and styling