Can you remove the whitespace-only changes from this PR?