Changed B branches names and code cleanup