ENH: Plot formatting.
BUG: Cleanup plot enhancement.
Merge branch 'develop'