Formatting & import cleanup.