Refactoring idea