minor refactoring of the Branch type declaration
removing some unused imports