Fixing gitignore
Adding .idea
Refactoring