.gitignore, and some formatting