cleanup with sonar output ( Visibility Modifier  , Parameter Assignment,  Simplify Boolean Return  )