Breakpoint 1, re-factor