refactor settings slightly
refactor settings