Code cleanup/changed .gitignore