AafServiceImpl refactor and sonar fixes