Refactor #new_body