Some rework markup and branch-fu