Formatting and imports organization and cleanup.