Further improved formatting.