Moved settings into settings file