Settings default store (and some cleanup)