Refactor

juste before