Sonar violations

* Singular field
* Magic Number