I don't really like changing unrelated lines. We can open a separate PR