Clean up. Working toward HTML validation.