Minor git upkeep and less minor refactoring