refactoring settings somewhat