Branch list refactor