Small refactoring and gitignore update