chore(sonar): Phase 1 maintainability cleanup (~50 issues) (#75)

chore(sonar): Phase 1 maintainability cleanup (~50 issues) (#75) #42