Refactor some
Remove .idea folder
Merge branch 'sunny' of https://github.com/sunny-mittal/class-project into sunny