dev: refactoring by sonar review