Minor changes and formatting improvements.