added first part of refactored statistics
refactored constants call
sonar refactorings
Merge branch 'master' into release