clara refacto
merge commit and refacto