Reorg
Cleanup
Don't include empty arguments
Don't include help popup events