simplification for next refactoring