White space and code style corrections.