Code review feedback, and deselect call block when clicking edit