Readability: Rearrange to 80ish chars/line