git refactorings / improvements to autocomplete