Status: indentation and style, no functional changes.