AafServiceImpl refactor and sonar fixes

No match.