Fixed typos and restructed 117-130 into one line