Spacing and code style cleanup.