yeah, I'll clean up whitespace diffs from now on