General formatting cleanup