Improve readability and .gitignore