Refactor

still necessary ?