Made a functional call easier to read
Fixed some typos