Refactor on branches to be global