Whitespace and import improvements.