Refactoring
Updated gitignore