refactor code - add inline breakpoints;