Minor refactoring of bootstrap and git subtask