Fix up indentation and coding style.