easy refactoring + revert correction