Address some sonar issues

No functional changes intended, this just addresses some sonar issues such as Cognitive complexity, unused variables, redundant return on awaits and some type declarations.