Refactored some Git Extra completion