Clean up and terseness.