More whitespace and case tweaks