Small changes from inspection run. Formatting and blank lines.