fixed sonar issues and formatted code