some clean up on the settings (still work in progress)