a little cleanup [ moved settings to application ]