Small changes, mostly for style and readability.