Branch spec refactoring