cleanup
Reorganize settings