BUG: Cleanup plot enhancement.