format and sonar issues