Refactor settings update; call on session init