started refactoring of settings and setup