Minor fixes: clean code (II)
Update .gitignore