.gitignore and .gitattributes
minor refactoring