Refactor in setting assessment