On going refactoring