Refactoring contiually