added refactoring idea