Add and remove some lines for readability