Fix presentation and formatting issues

Fix a handful of presentation and formatting issues.