Formatting cleanup; added test.