Brian Adams' changes. Formatting, etc.