Cleaning up; breakpoint shortcuts