Clean code and updated .gitignore