Refactoring on going