More clean up and added .gitignore