Fixing reductions
Refactor