Refactoring
Cleanup gitignore