Updating gitignore
Refactoring
Cleaning main