Refactor

useful ;)