[sonar fix] fixing some sonar problems. formatting code