PSR2 compliance
Accumulators refactoring