cosmetic and issues reported by Sonar