Formatting and import cleanup.