Do refactoring