Whitespace and import clean-up.