refactoring, moving reference to a more general place
no longer using sonar, scrutinizer-ci ftw