sonar issues, reformatting