Refactorig.