Formatting and imports cleanup.