refactoring branchShortName