Improve arrays rules
Reorder sections