sonar bug fix: make fields final