refactor for branchshortname