Fix typos
Unwrap some lines of code

Intended to make this more readable.
Clarify comment