Re-added refactoring changes