Cleanup.
Rename.
Add control parser utility function.