General formatting fixes; no functional changes