Git ignore, some refactoring