Minor code block and code style changes.