continus refactoring