Refactorig...