Cleanup and standardization
Updated .gitignore