fix sonar warnings

Nothing valuable changes