For future plans.
For future plans.
A bit of cleanup.