Clean up and add .gitignore