Cleanup and .gitignore added