Simplified breakpoint()
Cleanup and re-indentingzz