Refactoring of streak helpers.
Refactoring cycle done.