refactor
Merge branch 'refactor_pseud'