Small tweaks and whitespace removal.