Re-format and cleanup.