Whitespace and import cleanup