Refactoring efforts