Better structure

Cleaner and easier to maintain.
Yep, I never use it though. But I'll change it anyway.