S8373: Formatting and code cleanup