Refactor settings.yaml