Completed reformatting that was started in the previous commit