whitespace and import cleanup