Refactoring general