a little of refacto