slight gen change, encouraged by lint
settings refactor