Sonar fixes [formatting]