More cleanup and formatting.