Added general refactorx