Minor changes, mostly just syntax and formatting.