model changes for readability and .gitignore