nit: can you sort this down to just after the lib/git/... imports?