Minor cleanup and jazz.