Organizing and cleaning up settings